Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 17 Jun 2010 22:50:31 +0000 (22:50 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 17 Jun 2010 22:50:31 +0000 (22:50 +0000)

Trivial merge